Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Thu, 16 Mar 2017 20:43:32 +0000 (16:43 -0400)
committerTom Rini <[email protected]>
Thu, 16 Mar 2017 20:43:32 +0000 (16:43 -0400)

Trivial merge